Allow load_file to load segments too.

This will make it easier to process multi-file patches in
normal 'browse' mode.

Signed-off-by: NeilBrown <neilb@suse.de>

diff --git a/load.c b/load.c
index 6d691fe072e1eda1af646590bf92746f971594c8..90ca1af8addb33e318af833574cd81a1b1f47735 100644 (file)
--- a/load.c
+++ b/load.c
@@ -106,30 +106,56 @@ static struct stream load_other(int fd)
        return list[0];
 }
 
+struct stream load_segment(FILE *f,
+                          unsigned int start, unsigned int end)
+{
+       struct stream s;
+       s.len = end - start;
+       s.body = xmalloc(s.len);
+       fseek(f, start, 0);
+       if (fread(s.body, 1, s.len, f) != (size_t)s.len)
+               die();
+       return s;
+}
+
 struct stream load_file(char *name)
 {
        struct stream s;
        struct stat stb;
        int fd;
+       int start, end;
+       int prefix_len = 0;
 
        s.body = NULL;
        s.len = 0;
-       if (strcmp(name, "-") == 0)
-               fd = 0;
-       else {
-               fd = open(name, O_RDONLY);
-               if (fd < 0)
-                       return s;
-       }
+       if (sscanf(name, "_wiggle_:%d:%d:%n", &start, &end,
+                  &prefix_len) >= 2 && prefix_len > 0) {
+               FILE *f = fopen(name + prefix_len, "r");
+               if (f) {
+                       s = load_segment(f, start, end);
+                       fclose(f);
+               } else {
+                       s.body = NULL;
+                       s.len = 0;
+               }
+       } else {
+               if (strcmp(name, "-") == 0)
+                       fd = 0;
+               else {
+                       fd = open(name, O_RDONLY);
+                       if (fd < 0)
+                               return s;
+               }
 
-       if (fstat(fd, &stb) == 0) {
+               if (fstat(fd, &stb) == 0) {
 
-               if (S_ISREG(stb.st_mode))
-                       s = load_regular(fd);
-               else
-                       s = load_other(fd);
+                       if (S_ISREG(stb.st_mode))
+                               s = load_regular(fd);
+                       else
+                               s = load_other(fd);
+               }
+               close(fd);
        }
-       close(fd);
        return s;
 }
 

diff --git a/vpatch.c b/vpatch.c
index 653cdb6676d2770150486c37a974aca618936510..e881cea201d10f3ba08487fe159a4fa95116518e 100644 (file)
--- a/vpatch.c
+++ b/vpatch.c
@@ -49,9 +49,6 @@ static void term_init(void);
 
 #define assert(x) do { if (!(x)) abort(); } while (0)
 
-static struct stream load_segment(FILE *f,
-                                 unsigned int start, unsigned int end);
-
 /* global attributes */
 unsigned int a_delete, a_added, a_common, a_sep, a_void,
        a_unmatched, a_extra, a_already;
@@ -2038,18 +2035,6 @@ static struct plist *parse_patch(FILE *f, FILE *of, int *np)
        return plist;
 }
 
-static struct stream load_segment(FILE *f,
-                                 unsigned int start, unsigned int end)
-{
-       struct stream s;
-       s.len = end - start;
-       s.body = xmalloc(s.len);
-       fseek(f, start, 0);
-       if (fread(s.body, 1, s.len, f) != (size_t)s.len)
-               die();
-       return s;
-}
-
 static int pl_cmp(const void *av, const void *bv)
 {
        const struct plist *a = av;

diff --git a/wiggle.h b/wiggle.h
index 1bbe4ddd95f65601ed7af21a271e588ece9858d4..82e8e10ff69d1892701f6e2ab3c73f5f126153b3 100644 (file)
--- a/wiggle.h
+++ b/wiggle.h
@@ -117,6 +117,8 @@ struct merge {
                    */
 
 };
+extern struct stream load_segment(FILE *f, unsigned int start,
+                                 unsigned int end);
 extern struct stream load_file(char *name);
 extern int split_patch(struct stream, struct stream*, struct stream*);
 extern int split_merge(struct stream, struct stream*, struct stream*,